From d1876207183a69582acbadba7d64730ceed71ab9 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Sun, 31 Aug 2014 13:22:09 -0700
Subject: [PATCH] Update docopt to fix -- option parsing

Closes #492
---
 Cargo.lock               | 19 ++++++++++++-------
 tests/test_cargo_test.rs |  2 +-
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5f296b4f1..2f70d2866 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,8 +2,8 @@
 name = "cargo"
 version = "0.0.1-pre"
 dependencies = [
- "docopt 0.6.0 (git+https://github.com/burntsushi/docopt.rs#e20dceb065949fe563781daa205626820717359b)",
- "docopt_macros 0.6.0 (git+https://github.com/burntsushi/docopt.rs#e20dceb065949fe563781daa205626820717359b)",
+ "docopt 0.6.2 (git+https://github.com/burntsushi/docopt.rs#3bf52a9f9cf13e00cca00ff49da39d5c9caa48e9)",
+ "docopt_macros 0.6.2 (git+https://github.com/burntsushi/docopt.rs#3bf52a9f9cf13e00cca00ff49da39d5c9caa48e9)",
  "flate2 0.0.1 (git+https://github.com/alexcrichton/flate2-rs#12593d1b9ccf09c2eabac176a6e233b171eed843)",
  "git2 0.0.1 (git+https://github.com/alexcrichton/git2-rs#f2b79dd951e92171b151100d69c32c0bf137a328)",
  "glob 0.0.1 (git+https://github.com/rust-lang/glob#c4495d9f2f2a1b22173b860f907760ba8c419843)",
@@ -16,15 +16,20 @@ dependencies = [
 
 [[package]]
 name = "docopt"
-version = "0.6.0"
-source = "git+https://github.com/burntsushi/docopt.rs#e20dceb065949fe563781daa205626820717359b"
+version = "0.6.2"
+source = "git+https://github.com/burntsushi/docopt.rs#3bf52a9f9cf13e00cca00ff49da39d5c9caa48e9"
+
+[[package]]
+name = "docopt"
+version = "0.6.2"
+source = "git+https://github.com/docopt/docopt.rs#3bf52a9f9cf13e00cca00ff49da39d5c9caa48e9"
 
 [[package]]
 name = "docopt_macros"
-version = "0.6.0"
-source = "git+https://github.com/burntsushi/docopt.rs#e20dceb065949fe563781daa205626820717359b"
+version = "0.6.2"
+source = "git+https://github.com/burntsushi/docopt.rs#3bf52a9f9cf13e00cca00ff49da39d5c9caa48e9"
 dependencies = [
- "docopt 0.6.0 (git+https://github.com/burntsushi/docopt.rs#e20dceb065949fe563781daa205626820717359b)",
+ "docopt 0.6.2 (git+https://github.com/docopt/docopt.rs#3bf52a9f9cf13e00cca00ff49da39d5c9caa48e9)",
 ]
 
 [[package]]
diff --git a/tests/test_cargo_test.rs b/tests/test_cargo_test.rs
index f6f492389..fbe4cbf27 100644
--- a/tests/test_cargo_test.rs
+++ b/tests/test_cargo_test.rs
@@ -895,7 +895,7 @@ test!(test_no_harness {
         .file("src/main.rs", "fn main() {}")
         .file("foo.rs", "fn main() {}");
 
-    assert_that(p.cargo_process("test"),
+    assert_that(p.cargo_process("test").arg("--").arg("--nocapture"),
                 execs().with_status(0)
                        .with_stdout(format!("\
 {compiling} foo v0.0.1 ({dir})
-- 
2.30.2